In the case for FILTER_RULE_PIXBUF_FORMATS, check that

2005-12-27  Federico Mena Quintero  <federico@ximian.com>

	* gtk/gtkfilefilter.c (gtk_file_filter_filter): In the case for
	FILTER_RULE_PIXBUF_FORMATS, check that filter_info->mime_type is
	not NULL.  Fixes bug #317687.

diff --git a/ChangeLog b/ChangeLog
index e68f8b8ba07f3b92e2e57b9da8619b96f132907e..25f854c2369bfc6c3588818722bdc9b50301803b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-12-27  Federico Mena Quintero  <federico@ximian.com>
+
+       * gtk/gtkfilefilter.c (gtk_file_filter_filter): In the case for
+       FILTER_RULE_PIXBUF_FORMATS, check that filter_info->mime_type is
+       not NULL.  Fixes bug #317687.
+
 2005-12-27  Matthias Clasen  <mclasen@redhat.com>
 
        * gdk/x11/gdkevents-x11.c (check_transform): Fix a typo.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e68f8b8ba07f3b92e2e57b9da8619b96f132907e..25f854c2369bfc6c3588818722bdc9b50301803b 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2005-12-27  Federico Mena Quintero  <federico@ximian.com>
+
+       * gtk/gtkfilefilter.c (gtk_file_filter_filter): In the case for
+       FILTER_RULE_PIXBUF_FORMATS, check that filter_info->mime_type is
+       not NULL.  Fixes bug #317687.
+
 2005-12-27  Matthias Clasen  <mclasen@redhat.com>
 
        * gdk/x11/gdkevents-x11.c (check_transform): Fix a typo.

diff --git a/docs/reference/gtk/gtk-docs.sgml b/docs/reference/gtk/gtk-docs.sgml
index 78f09b274f5dc9d303d3ac966a33e485c1113d6e..4d9d862def5d281dcf228dbbd81b443b250fe05a 100644 (file)
--- a/docs/reference/gtk/gtk-docs.sgml
+++ b/docs/reference/gtk/gtk-docs.sgml
@@ -190,6 +190,7 @@
 <!ENTITY gtk-Changes-1-2 SYSTEM "changes-1.2.sgml">
 <!ENTITY gtk-Changes-2-0 SYSTEM "changes-2.0.sgml">
 <!ENTITY gtk-migrating-checklist SYSTEM "xml/migrating-checklist.sgml">
+<!ENTITY gtk-migrating-Cairo SYSTEM "xml/migrating-Cairo.sgml">
 <!ENTITY gtk-migrating-GtkFileChooser SYSTEM "xml/migrating-GtkFileChooser.sgml">
 <!ENTITY gtk-migrating-GtkAction SYSTEM "xml/migrating-GtkAction.sgml">
 <!ENTITY gtk-migrating-GtkComboBox SYSTEM "xml/migrating-GtkComboBox.sgml">

diff --git a/gtk/gtkfilefilter.c b/gtk/gtkfilefilter.c
index 80d1ffb7445be4fc7729b70c8c608e548b53775a..b5b285e2e1045557c4ca0513fb2b5f528d3d80ea 100644 (file)
--- a/gtk/gtkfilefilter.c
+++ b/gtk/gtkfilefilter.c
@@ -426,6 +426,9 @@ gtk_file_filter_filter (GtkFileFilter           *filter,
          {
            GSList *list;
 
+           if (!filter_info->mime_type)
+             break;
+
            for (list = rule->u.pixbuf_formats; list; list = list->next)
              {
                int i;